Merge "Split the return animation framework flag into two." into main