Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0