Merge "Restore 1:1 relationship between swipe and shade expansion" into sc-dev