Merge "Make window token add/remove APIs require displayId"