Merge "[Sb] Use WIFI_NO_INTERNET_ICONS instead of resIds directly" into main