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