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

* commit '447d9c3b56b0f688f675096a687015007055f265':