Merge "Optimize text drawing in CollapsingTextHelper" into mnc-ub-dev