Merge "Visit Uris added by WearableExtender" into udc-dev