Merge "Make sure activity is started in requested windowing mode" into sc-dev