Merge "Fix for crash seen in WifiManager#getUsableChannels()" into sc-dev