Merge "Support both grid and large tile with gridOnlyOverivew" into main