Merge "Don't re-inflate bouncer" into pi-dev