Merge "Show correct sort header after root switch." into nyc-andromeda-dev