Merge "Fix for night mode not applying after resume"