Merging the fix to disable generate design when there is measurement already

Reviewer: Chezka Arevalo (Post commit)

Issue: GCP-10013