Merge "fix NuPlayerDecoder discontinuity handling with async mode"