Merged "Navigation pane merged with Video Player -FIXED" patch