Merge "Fixing some missing swipecancelled events" into main