Merge "Controls UI - Spinner cleanup" into rvc-dev