Added condition on when to replace the measurement list or not when saving

Reviewer: Dan V

Issue: GCP-9822