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

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