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