Merge "Fix clipping of SecondaryLabel on animation" into sc-dev