Merge "Don't persist new night mode setting in car mode" into qt-r1-dev