Merge "CardView improvements" into lmp-preview-dev