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