Merge "Invalidate TextView on change of elegantTextHeight" into nyc-dev