Merge "Disallow 2-finger swipe from the corners to trigger assistant from trackpad" into main