fix(query-builder): refactor expression tree change emission for consistency - 21.1.x

fix(query-builder): refactor expression tree change emission for consistency - 21.1.x #34889