am 59cbd418: am 4d173e93: Merge "Fix rendering bug while dragging" into jb-dev

* commit '59cbd4188958b644afe677cb5cef39f221c993a2':
  Fix rendering bug while dragging