Merge "Fix broken SystemUITests"