Merge "Rename drag "thumbnail" to the drag "shadow"" into honeycomb