Merge "Revert "Revert "Check that ViewTreeObserver is alive before unregistering listener."""