Merge "Rename app_shape_and_grid to app_shape_grid" into main