Merge "Revert "Fix broken status bar when activity is showing above keyguard""