Merge "Optimise the hit test algorithm" into oc-dev
am: 6064d8fd4c

Change-Id: I465c15edb18c3084e6b8cbf1f42c0c2c1ebea4eb