Merge "Fix for enqueueEOS from timing out" into rvc-dev