Merge "Preserve notification stats on update"