Merge "Removing source stop at flush for Modular DRM"