Merge "Mask bitmap creation errors while dragging shortcuts." into froyo