am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc87  -s ours automerge: 381dfa7  -s ours
automerge: 1fc26a4  -s ours

* commit '1fc26a481c0b5465dc5adcb51040b81b59d7fdaf':
  If no display settings are matched, return the first one. DO NOT MERGE