Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev