Merge "Fix for NPE in TextView." into gingerbread