Merge "Update jank reasons in timestats" into sc-dev