Merge "Clear callbacks when destroying DvrHwcClient" into oc-dr1-dev