Merge "Update the flyout collapsed position" into main