Merge changes from topic "am-a4823cf8e1044d409c5c3b3e3d02ae9d"

* changes:
  [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into tm-dev am: c4f898fb -s ours am: 15ad68d6 -s ours
  [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c98 2p: dde281c5 am: 03fb5132 -s ours am: 4eadd936 -s ours