Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev