Merge "Guard against NPE when root view is detached"