Merge "Fix possible NPE when a ViewRoot doesn't have a view"