Changed retry and repeat notification handlers to return Observable<?>