Merge "Fix decoder instantiation during playback"