Make sure to set the right cursor for the surface on mouse enter

Change-Id: I09527c8cfc0abfb7b1786a65b8c4d3e6d176978f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Merge branch 'stable' into hawaii-stable