Merge "Update TextAnimator to retry with updated layout when failed" into main