Merge "Controls UI - Fix heating color" into rvc-dev am: 75de521133 am: ba402fbc67 am: d172f6d3c0

Change-Id: I2496982009dc4cef827d4e85050201873add5661