Merge "Fix PlaybackGlueTest on v17" into nyc-support-25.2-dev