Merge "Turn off policy size tracking changes" into main