Merge "Fix NPE when a view is traversed without a parent." into jb-dev