Merge "Disable TextView fades" into jb-mr1-dev