Merge "Add dialog for recommended controls" into rvc-dev