Merge "Revert "Add flicker tests to verify non-match parent on exit PIP"" into main