Merge "TextView should fade edges according to text." into nyc-dev