Merge "Instrumenting swiping up to all apps for jank" into sc-dev