Merge "Remove wifi scan-always dialog." into jb-mr2-dev