Merge "Fix for Bundled Effects level compensation" into lmp-mr1-dev