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

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':