Merge "Settings: Remove unused WIFI_SAVED_STATE"