Merge branch 'feature/8-scrolling-video-list' into develop