Merge "Draw PipContentOverlay when enter PIP with Shell transition"