Merge "Test activity lifecycle when changing multi-window mode" into pi-dev