Merge "Don't process broadcasts until really ready." into pi-dev