Merge "Controls UI - Remove reset" into rvc-dev