Merge "Add new capability polling opt-in intent" into rvc-dev