Merge "Add DiffCallback to handle Contextual Cards update."