Merge "Fixed single line state on TextView." into gingerbread