Add CookieViewView
Merge branch 'video-view'