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

Change-Id: Iadf1d1b0664eb0c49b2d6ba21adc059f8e764eee