Merge "Unhide Playback APIs" into main