Merge "NuPlayerDriver: avoid deadlock."