Merge "Fix wrong userId being reported to CUJ metrics"