Merge "Fix TextView.shouldAdvanceFocusOnTab()."