Merge "Don't switch to handle drag mode when starting selection"