Merge "Controls UI - Support remaining confirmation dialogs" into rvc-dev