Merge "Avoid risk of deadlock between APM and sound trigger"