Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev