Merge "Revert to previous metric for jank reporting" into sc-dev