Merge "Fix: Wrong TextView height when DynamicLayout is used."