Merge "Improve hierarchy viewer dump hierarchy latency" into mnc-dev