Merge "Fix 5615747 Don't leak remote control client death handlers" into ics-mr1