Merge "Extract DeviceIdleInternal"