Merge "Refactoring in TextViews' handles"