Merge "Do not show progress bar when disabling wifi." into oc-dev