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

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