Merge "Update displayId when a window is moved to a new display" into pi-dev