Favor on doOnTerminate over EndObserver
Update dependencies