Merge "Revert "Always report mandatory insets for button nav"" into 24D1-dev