Merge "Fixed incorrect service state populated" into qt-dev