Merge "Update flyout content during animation" into main