Merge "Remove getPrimaryPhysicalDisplayId"