Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev