Merge "Exception in the touch explorer when dragging." into jb-mr1-dev