Merge "Fix dumpDebugInfo blocked and phone hanging"