Merge "Rename two part drag to freeform transitions" into udc-qpr-dev