Merge "Controls UI - Support custom colors/icons" into rvc-dev