Merge "Added TestApi for default focus highlight" into pi-dev