Merge "Delete unused resources from the StackStateAnimator" into main