Merge "Cleanup drag and drop flow/code organization" into udc-qpr-dev