Merge "ApiCSPReport: Log user ID instead of name, and limit urls to origin"