Reflash your NIT and leave it always on. Usually the battery drain is gone after a reflash. Better wait for Diablo to reflash.

Turning it off after inactivity is no solution for this problem. I wouldn't even call it a workaround.