Merge changes from topic "am-10a81da11b954d3cb5e4697365ec46f3"

* changes:
  [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6 -s ours am: e6f05647 -s ours am: b6f75ad0 -s ours am: 4900eace -s ours
  [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c98 am: 24bedd15 -s ours am: b6785cc6 -s ours am: 2646e5f0 -s ours am: 71c381f4 -s ours