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

Change-Id: Id856368d4da90c4efb660ee4598b7d2ae4a75dc7