Merge "Ensure cursor drag is suppressed during selection drag"