Merge "TextView's display list updated on layout"