Merge "Reduce wtf spam when a service onDestroy races with proc death" into nyc-dev