Favor on doOnTerminate over EndObserver, update dependencies