Merge "Add method to get blocked channel counts" into pi-dev