Merge "Replace tree observer with a JNI call at draw time" into jb-dev