Merge "Add extra systrace tracing" into jb-dev