Merge "Removed ViewTreeObserver in TextView when handles are hidden"