Merge "Removed ViewTreeObserver null checks"