Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-v2-dev