Merge "Bouncer visibility fixes" into pi-dev