Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev