Merge "Add a feature flag for moving global restrictions in user 0 XML" into main