Merge "Remove listener alarms when remote binder dies"