Merge "Add null check for getCurrentWifiConfiguration" into rvc-dev