Merge "Fix flickering for anchored + inset dodging views" into nyc-support-24.1-dev