Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev

* changes:
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829
  Keyguard - Treat messsages to lock with priority