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

* commit '4846a93b55d7c8bf1af78cbeb3389801cff28e99':
  Only call dump when a ViewRoot actually exists