am ca00240f: am cd1092ce: am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit

* commit 'ca00240fe4584768446fbb5f68eda8b7871fee9f':
  Adjusting grid for tablets and fixing incorrect resources for large tablets.