Merge "[V2] Allow DumpViewHierarchy cmd to be interruptible without breaking." into main