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