Merge "Ensure userId is set in TCEvent."