Merge "Fix disappearing status bar icons with SHOW_WHEN_LOCKED"