Merge "Introduce the display ID to TaskKey" into qt-dev