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

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