Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev