Merge "if savePicture failes, delete the file (which is now unreliable, and possibly large)"