Merge "Use user WFC setting instead of checking WFC service status"