Merge "Fix settings handling of wifi events"