Merge "Ensure status bar color gets set" into lmp-dev