am 3e297b57: Merge "Mask bitmap creation errors while dragging shortcuts." into froyo