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

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