Merge "Fix drag shadow does not render on screen when perform drag (1/2)"