Merge "Fix a bug where custom cards are not refresh when removed"