Merge "Removed video player plugin" into devel/master