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