Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev