Merge "Fix component in ControlsRequestDialog" into rvc-dev