Merge "Merge "Avoid creating multiple death recipients for same observer" into qt-dev am: a478c5f9aa am: 3c36699987" into qt-r1-dev-plus-aosp