Merge "Revert "add null check on ViewRootImpl"" into jb-dev