Merge "Controls UI - Only show controls after device is setup" into rvc-dev