Merge "Clean up commonSurfaceAnimator flag" into main