Merge "Also catch one more tablet layout NPE." into klp-dev