Merge "Rename variable disp to displayId for consistency"