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

* commit 'c226801a43c17d41e59988adbb77fd06f2f77c9d':