Merge "Create flag for new App Pairs feature" into udc-dev