Merge "Update enable_grid_only_overview to use correct release bug" into main