Merge "Allow per display level private flag control for physical secondary displays" into qt-dev