Merge "Support WM & SF dumps with ADB Connect, minor fixes"