Merge "Add feature flag for the new user interaction apis." into main