Merge "Make CardView respect the theme it is running in" into mnc-ub-dev