Merge "Changed way test launch activities into split-screen windowing mode"