Merge "Refine ViewTreeObserverWrapper"