Merge "Remove weak reference to prevent loss of callback"