Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev