Merge "Fix missing gesture insets for 3-button navigation"