Merge "Handle enter PIP during a display rotation transition"