am 96b8a056: Merge "Fixing NPE in DragController. (Bug 6449615)" into jb-dev

* commit '96b8a056f81720e632d07e3467f1528e834f746e':
  Fixing NPE in DragController. (Bug 6449615)