fix for layout expansion crash on server picker.