Merge "PlayerBase: fix deadlock" into pi-dev