Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb