Merge "Speed up sysui tests"