Yes, it's the solenoid.
Had exactly the same problem: no symptoms at all went the light was on.
The first time, I replaced the solenoid, which is quite expensive.
Then some few weeks ago, the light came on again.
This time, the remap did it all. The light went off without me touching the solenoid.