Merge "Fix scroll listeners lost in ViewTreeObserver."