Merge "Update walled garden detection logic"