Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev