Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp * commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4': Line up textfield with WebTextView more often.