Merge "Revert "Clean up hiden notifications on Keyguard handling"" into lmp-dev