Merge "Controls UI - Fix heating color" into rvc-dev