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

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