am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a...
am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev
* commit 'b02b14b2':
Do not do a layout and write while a cancellation is in progress.