Merge "Implement no animation expand pip (2/2)" into main