Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev