Merge "Optimise the hit test algorithm" into pi-dev
am: 0192e9a213

Change-Id: I7c42beb5b63332748d05a7dd4fc7b0e50e5d8f08