Merge "setCarMode() only when car mode changes" into nyc-mr1-dev