Merge "Revert "Fix OnBackAnimationCallback not receiving updates"" into main