Merge "Fix swipe up to unlock, then swipe down" into main