Merge "Remove string concatenation uses with ActiveGestureLog" into main