Merge "Add test case for racing between process's death and service's stop"