am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev

* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
  Fix quick settings on Keyguard