Merge "Merge "Handle onBindingDied in notification manager" am: a13201a99b am: d69921cc9a am: a92bcc33b2"