Lock layout while consuming updates for measure
am: adbd64f08d

Change-Id: I48e5ac34018c9a5b21f6f0e499d01846771342ef