Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev