Incorporated fix for blocking future cancellation bug in RxJava