Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0