Merge "APC: Add possible deadlock fix when creating track" into main