Merge "Fix silly touch bug in TextView. Oops." into gingerbread