Merge "Feature flag to change back to 7% small area." into main