Merge "Made TextView use the new localState API for drag info"