[Q] - Mobile Radio Keeps Active While Connected to WiFi

Hello.

I've an XT1058, which was running 4.4.4 retail argentina, then got the ota for 5.1 ...
I noticed battery life was impacted, thus I flashed the full 5.1 firmware from scratch, just to be sure...
Battery didn't get any better...

After days and days of testing, I found that my issue is that LP does not deactivate the mobile radio while being connected to a wifi network...
That's just killing my stand by time on wifi, which oddly enough does not affect the phone while actually using mobile network...
So I'm currently having better battery life while on mobile data than a healthy wifi connection...

All because mobie radio keeps active all the time while on wifi...

I managed to partially fix this bug, but it does not always work...
It basically is to play with airplane mode, deactivate mobile data, and connecting to wifi...
All that, just mixing the order and crossing your fingers... Some times it works, some times it does not...

Airplane mode does not work either, since while activated, you can actually see that "radio active" under "idle device" keeps adding seconds...
And battery life is less...

Any ideas ?
I believe this is being addressed in M, but I do not thing XT1058 will get it...
I'm seriously considering downgrading to 4.4.4 because of this...
My phone is 100% stock, no unlock bootloader or root...
And yet, it's less usable than a few weeks ago...

Thank you.