Merge "Fix overlapping text in CMAS list items." into klp-dev