Merge "Adds flag for UI changes in bundles/classification" into main