Merge "Prevent AudioService dead lock issue."