Error Handling Unsubscribe and Terminal State

This is related to work done in https://github.com/ReactiveX/RxJava/pull/1657