Merge "Preserve interrupted state across waiting for future" into rvc-dev