Merge "Check if the display is attached when updating config"