Merge "Fix OnBackAnimationCallback not receiving updates" into main