Merge "userspace reboot: stop post-data services and wait for them to be killed"