Merge "Swipe a little, open shade a lot" into sc-dev