Merge "Fix SystemUI jank tests"