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

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