Merge "Use a strongly typed LogicalDisplayId for displayId(1/n)" into main