Refactor ExpandAndShrinkCardView to accept different layout wrapping
Fix code formatting
Merge branch 'yongkaiteo-L1001'