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

* commit '5de6787d1e90991af85d677bf38e242fcba427a1':
  Fix tablet layout and resources.