Merge "[PiP2] Implement expand in fixed rotation" into main