Merge "Trace: add a tracing tag for video" into jb-dev