Merge "Add feature flags for various device policy features" into main