am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev

* commit '6be8dde6f6447fe56af2a52554bba77ad0ee8d9c':
  Only call dump when a ViewRoot actually exists