Merge "Improve Selection handle hit region so not above the handle" into devel/master