Merge "In 3-button landscape/seascape, override nav insets to always present" into main