Merge "Fix swipe up to home gesture when entering scheduler page" into main