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

Change-Id: I8c4c22d5ca1f4bedba52e3b58b8e33c71ae684bd