Merge "Excluding corner radius from quick switch gesture." into sc-dev