Merge "Workaround regression in multiwindow mode change callback" into pi-dev am: 2d41269fa3
am: 2febedea74

Change-Id: I51897926f89ac2f022db6cda924fe89c9407e5e9