Merge "Add UID printing to tombstone headers" into qt-dev