Merge "CSD: Add check to avoid crash when persisting dose records" into main