Merge "Fix a data type of the display ID"