am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev

* commit '5d2c1d54b953ac0e4243210237fec92e3105844e':
  Ensure sort menu is shown as needed.