Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev