Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev