Merge "Add jank instrument support for split screen" into tm-dev