Merge "Revert "Add display ID parameter to window policy wakeUp()"" into main