Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev