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