Merge "Fix invalid comment in WebSettings." into gingerbread