Merge "Remove scheduled timeout onError or onComplete" into rvc-dev