Merge "Fix touch fails after drag and drop" into rvc-dev