Merge "Fix a race condition in DeviceIdleControllerTest."