fix v2 task switching

Signed-off-by: Robert Xu <robxu9@gmail.com>