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