Merge "Fixed incorrect merge service state" into qt-r1-dev