automerge: d3adc51a -s ours * commit 'd3adc51a': If no display settings are matched, return the first one. DO NOT MERGE