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

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