Merge "check for null ViewRootImpl" into jb-dev