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

Change-Id: I88e719ecd81b3a2cd0bf0eeb51e6a0ed58f6dea2