Merge "Remove ENABLE_OVERVIEW_GRID feature flag"