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

Change-Id: I87cab146fe9726ff1ea9b4868f86a87e54e3911e