Merge "Fix SF jank classification" into sc-dev