You may have tried this before, but based on a tip somewhere else on the forum, I switched off "Enable Fast Boot" in settings. This cured my battery drain problem after rebooting "properly". I guess the Fast Boot leaves some rogue things not cleaned up so rebooting doesn't help. I'm now back to...