Merge "Collapse the stack on clicks rather than on down" into sc-dev