Merge "Handle DebugVariableInfoMarker when removing variable name" into ub-jack