Merge "Adding Wifi setting to special_access settings"