Merge "Use new captureScreen method with displayId or layerStack" into qt-dev