Merge "Fix deadlock when killing adb bugreport" into lmp-dev