Merge "[1/N] Make alternateBouncer its own view" into main