Merge "Fix unregAll throwing Concurrent exception"