Merge "Reapply "Implement Start/Stop Playback APIs"" into main