Merge "Don't double lock when resetting jank tests" into sc-dev