Merge "Removed debug code in TextView" into jb-dev