Merge "Fix double back swipe not working" into main