Merge "Check for valid surface when starting to drag"