Show correct sort header after root switch.
am: 743bc1befc

Change-Id: I561508c5ff3f7bd92e494633668b5239b6d295af