Merge "Update primary bouncer background color" into main