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

Change-Id: I66a30b53f9b84894fa4f30cea16f8408261d0630