Merge "Fix testNightModeAutoNotPersistedCarMode" into rvc-dev