am 2b65ed77: am 4fc5cfb4: Merge "Fix NPE when a view is traversed without a parent." into jb-dev

* commit '2b65ed772fdb929421ee4446c9096cd77ab60a7c':
  Fix NPE when a view is traversed without a parent.