Merge "Skip persisting when there's no change."