Merge "Improve switching to car mode, retain night mode option."