Merge "Set position during shrink animation." into main