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