Merge "Exit PIP with fixed rotation with Shell transition" into tm-dev