Merge "Reland "Print display id as integer"" into main