Merge "Add DvrClient and DvrClientCallback"