Merge "Lock layout while consuming updates for measure" into nyc-support-25.1-dev
am: 19ec9dc666

Change-Id: I534ab4d7e4850c755d6b77b172dc60dbf67545d5