Merge "Ensure sort menu is shown as needed." into mnc-dev