Merge "Only allow RecordDVR to flush buffer when the DVR is stopped"