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

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