Merge "Update the wifi on but disconnected qs icon" into nyc-dev