saga: sweep2wake clean up, fix a stupid error and disabled by default
Merge branch into kk_mkt