Merge "Add flicker tests for non-match parent exit PIP animation" into main