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

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