Merge "[Shell Transition] Fix exit PIP crash when there are multiple activity" into tm-dev