am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc876 -s ours
automerge: 381dfa70 -s ours
* commit '381dfa70':
If no display settings are matched, return the first one. DO NOT MERGE