Merge "Instrument jank of CUJ take screen shot" into tm-dev