Merge "Controls UI - Fix challenge dialog default" into rvc-dev