Merge "Make the compose bouncer run on a narrower scope." into main