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

Change-Id: I659d556f9eaa4e614951c17b81f6a98b04374d44