Merge "Fix CancellationSignal deadlock." into jb-dev