Merge "Workaround regression in multiwindow mode change callback" into pi-dev