Merge "TestHarnessModeService uses MainUser"