Merge "SF: Fix getAllowedDisplayConfigs in multi-display mode" into qt-dev