Merge "sigchain: properly block signal when we forward." into oc-dev