Merge "Migrate ENABLE_GRID_ONLY_OVERVIEW to aconfig" into main