Merge "Fix typo that caused excessive display config updates"