Merge "Fix bug 2747634 - Crash on selecting wifi"