Merge "Fix possible crash when swiping horizontally" into main