Merge "Re-enable focus highlight on root list." into nyc-andromeda-dev