Merge "Fix PIP exit animation flickering on non-match parent activity" into main