Merge "Avoid duplicated crop in PipAnimationController" into main