Merge "Only check for remove drag coordinates when remove is available." into main