Merge "Remove ViewTreeObserver allocations" into jb-dev