Merge "Fix leak fix in ViewTreeObserver" into klp-dev