Merge "Fix empty program list filter handling." into pi-dev