Merge "Fix issue where bouncer would go away" into pi-dev