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