Merge "Don't block the UI when rearranging icons." into gingerbread