am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more...
am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
* commit '06398768':
Fix 5288804: Make music trasports in lockscreen more closely match design