Merge "Handle swipe up after quick switch in overview grid" into sc-dev