Merge "Avoid creating multiple death recipients for same observer" into qt-dev am: a478c5f9aa
am: f574979713

Change-Id: Ic3e2adf8073dab7f35239b1dfe40e579903e7810