Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev