Merge "Hide new Hotspot preferences if feature is disabled" into main