Merge "Fix rendering bug while dragging" into jb-dev