Merge "Fixing issue with items not being removed from the homescreen. (3392097)" into honeycomb