Merge "Remove focus highlight from scrims" into pi-dev
am: b273217c6e

Change-Id: I417f46a3912229023612ab2dbaac95455024547a