Merge "Fix nits in contextual card package."