Merge "Remove delay_bouncer flag" into main