Initial commit of hi-res video changes
Still need to do FV testing
Hi-res video markups
Fix NPE in debug log line
Merge branch 'hiresvideo'