Merge "Fix drag and drop access wrong pointer id"