Merge "TextView refactoring to ease future merges in HC." into gingerbread