Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-dev