sweep2wake: merge with ak and fix late resume problems