Merge "Added doxy comment for video-view" into devel/master