Merge "Clean up FeatureFlags.java" into main