Merge "Fix systemui tests on APCT."