Merge branch 'cm-12.0-wip' into cm-12.0
saga: sweep2wake clean up, fix a stupid error and disabled by default