Fix some issues from the merge conflict
Merge branch 'feature-h264-videostorage' into Video-Highlander-Branch
Resolve post merge build issues with braces