Merge "Make sure to update bouncer mode on config change" into main