Merge "Fix bug in policy size limit tracking logic" into main