Merge "Keyguard - Treat messsages to lock with priority" into sc-dev