Merge "Controls UI - Fix colors" into rvc-dev am: 8fb1fb93 am: 16645c16 am: b2e4f8c2 am: 109d62a6 am: 4376197c Change-Id: I296ce2146ac61c6bc1a63e16a9c5c2a71e8bba58