Merge "API fix in TextView" into jb-dev