Merge "Fix notifications showing on keyguard"