am 9b1a986f: am b17e140a: Merge "Ensure drag outline & crosshairs disappear on drag cancel" into honeycomb

* commit '9b1a986fca868186e1cbc8dbe7ba558c50a18a91':
  Ensure drag outline & crosshairs disappear on drag cancel