Merge "Fix drag bug." into jb-mr1-dev