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

* commit 'af239b5f74ab95a7f373134e5e94fe51317bfa0c':
  Fix 6449259: FUL no longer overlaps music controls