am d94b1e11: Merge "Show view overlays in hierarchyviewer" into klp-dev

* commit 'd94b1e11b94b599a70e4a8cf738a9f62b7d67e36':
  Show view overlays in hierarchyviewer