Merge "Remove dead code related to playback suitability" into main