Merge "Honors three_button_corner_swipe flag." into main