am a9412556: Merge "Fix stale data in keyguard transport control display" into klp-dev

* commit 'a9412556d213e07b248ef7e924f0e4cee183efc5':
  Fix stale data in keyguard transport control display