Merge "Allow TextView to do its thing." into gingerbread