Merge "PlayerBase: add audio session ID" into sc-dev