am c2a667cc: am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours
* commit 'c2a667cc4e0607bc33248299bde6f9821de25ac1':
This commit is contained in: