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