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

Change-Id: If3c82f9d9dc70261f1789b67fd60791766ce45b4