Merge "[sysui] More weak references for event listeners"