Merge "Tidy up CardView's background handling" into mnc-ub-dev