Merge "Fix power issues around wifi scans." into jb-mr2-dev