Merge "Added TestApi for default focus highlight" into pi-dev am: 87f9818319
am: a6afc381c9

Change-Id: I034e076aa41e3866b84e19261132450991d9488d