Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev