Merge "Add a feature flag to remove hack code for without cross user permission." into main