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

* commit '4d173e93f077bdbc855cd1ef388dea4e21a234d5':
  Fix rendering bug while dragging