am 7cb93f4e: Merge "Fix tablet layout and resources." into klp-dev

* commit '7cb93f4e227d603dadd065ea4173b6779279221e':
  Fix tablet layout and resources.