Merge "Fix a deadlock symptom between AM/WM"