Merge "Fix SearchUiService memory leak by removing DeathRecipient from CallbackWrapper" into tm-dev