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

Change-Id: I746b3c7e08bee6900629252c467d2450bed96459