If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours
automerge: 01afc37 -s ours
* commit '01afc37403a244e75fbfa385b197d76e476213e8':
This commit is contained in: