Merge "Add trunk flag for overlay presentation" into main