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