Merge "Keep contextual card dismissal info upon deletion" into rvc-dev