Merge "Remove viewport display ID assignment in pointer mode"