Merge "Fix a couple of drag & drop crashes" into honeycomb