am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard...
am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev
* commit '495bd54c':
Revert "Fix dodgy states of keyguard transport controls"