Merge "Do not allow capability discovery until user opt-in occurs" into rvc-dev