Merge "Remove focus highlight from scrims" into pi-dev