Merge "Fixed incorrect merge service state" into qt-r1-dev am: 9544faab4a
am: dba9e126ec

Change-Id: Ieeb751136cb3840982dd51a9db36a1f39e701407