Merge "Remove ViewTreeObserver allocations"