Merge "Change the compose bouncer wire-up to follow recommended architecture guidelines" into main