Merge "Add feature flag to public API for IMS service." into main