Merge changes I388fc2b8,I639e8314

* changes:
  Remove Unused Function Declarations from DVR Default Implementation
  Clean Up Playback Thread in DVR Test Implementation