am f22a767e: Merge "Added UI for errors during layout and write." into klp-dev

* commit 'f22a767e872ec8f5c2531a88819e0f4574c78fe3':
  Added UI for errors during layout and write.