Merge "Cannot add null callbacks to ZenController" into pi-dev