Merge "Only consider active apexes for apex-system-service list."