Merge "Avoid seeing ClearAllButton for overview grid's snap position" into sc-v2-dev