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

* commit 'cb13a5460495d7b05e1667397166330bb3ac412a':
  Fix dodgy states of keyguard transport controls