Merge "Enter PIP when exiting prev PIP with Shell transition"