Merge "Collect transition participant when moving to a different display" into main