Merge "Fix status bar showing on lock screen on boot"