Merge "Support text shadows in CollapsingTextHelper" into mnc-ub-dev