Merge "Add mixed entering pip transition with display change" into 24D1-dev