Merge "Fix implementation of stopPlayback" into main