Merge "create a separate flag for the internal policy size tracking changes" into main