Merge "Show correct sort header after root switch." into nyc-andromeda-dev
am: 107b5f5b7f

Change-Id: I896b26d07ab954ac342c573d941724e9a23eef99