Merge "Fix for NPE when dragging on TextView"