Merge "Better messaging when Wi-Fi disabled." into jb-dev