Merge "Fixes re-setting activity type when embed activity in split-screen" into sc-v2-dev