Merge "Fix UID tracking in ProcessCpuTracker." into qt-dev