Merge "Controls UI - Rename 'quick controls'" into rvc-dev