Merge "If task dragged to outer disallowed area, position back under the area" into udc-qpr-dev