Merge "Line up textfield with WebTextView more often." into gingerbread