* commit '51e4f391717deb24ea7b22096df2ddb5535aee00': Revert "Fix dodgy states of keyguard transport controls"