am 49b6d38f: Merge "Fix dodgy states of keyguard transport controls" into klp-dev

* commit '49b6d38fe7308d4641046af4a2d062cdc6033c30':
  Fix dodgy states of keyguard transport controls