Merge "Fix headroom management in equalizer" into jb-mr1-dev