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

* commit '1af10256cd07c2c096e22038379210866dff82a2':
  Fix dodgy states of keyguard transport controls