Merge "SF: Add IGBP list leak debugging info" into pi-dev