Add telemetry plugin, merge telemetry and videoplayer
Fix for previous commit