Merge "Change the type of displayId to int32_t" into main