Merge "Fix adb dumpsys resource hang"