Merge "implement no animtion expand pip (1/2)" into main