Merge "Set preferred network types on background thread" into main