Merge "Change cancelCurrentTouch to collapseShade"