Show correct sort header after root switch.

Bug: 31119758
Change-Id: I4f99140d67196c363f0276bce2d57e93dad0187f
6 files changed