Merge "Add Trunk Flag for Interactive Divider" into main