Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev am: 86f8d22d am: d482cda9 Change-Id: I6285c9a7e08f226539d5e640f8bf5e4d94393770