Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev