Merge "Only call dump when a ViewRoot actually exists" into klp-dev