Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev
am: 86f8d22d6a

Change-Id: Ibde8751a52dc6b5273ea4d6fda8be2bd2a7dc8e0