Merge "Remove service defined in an APEX during userspace reboot"