Merge "PlayerBase: hide deprecateStreamTypeForPlayback"