Merge "service: Clean up IPC shutdown and add unit tests"