Merge "Fix a lock issue in AudioPortEventHandler"