Merge "ignore exception calling unlinkToDeath" into oc-dev