Merge "Save database download only if successfully replaced old one"