Merge "Reset messages when the keyguard isn't showing" into sc-dev