Merge "Fix for an NPE in TextView." into gingerbread