Merge "Lock layout while consuming updates for measure" into nyc-support-25.1-dev