Merge "Add feature flag for content URI permission APIs" into main