Merge "Add config_display.xml OWNERS" into main