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

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