am ba8129f1: am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev

* commit 'ba8129f1b15de500f46bd2adee251bf5d8bf5bbd':
  Also catch one more tablet layout NPE.