Merge "Catch exception when unlinkToDeath" into tm-qpr-dev