Merge "Dump client's selfReportedDisplayId, uid, and pid" into main