Merge "Fix a leak in TextView around ViewTreeObserver"