am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility...
am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0
* commit '1a59c7e3':
Fix 5358124: Better transport control visibility management in lock screen