Merge "Fix switch access for overview grid" into sc-v2-dev