Merge "Controls UI - Fix title icon" into rvc-dev