Merge "Improving jank tests diagnostics" into pi-dev