Merge "Prevent double teardown of service connections" into qt-dev
am: ae76af46b2

Change-Id: I47d3b9eb266f19a9f81ef6c1447fb8f112be89dd