Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread