Merge "Add jank severity type for actual frame timeline." into main