Merge "Store last-resume times in a separate XML file."