Merge "Revert "Fix decoder instantiation during playback""