After April update I got some error while retaining the folder structure so I did a hard reset after that I see battery life is doing better. I got close to 7+ hrs SOT with more than moderate usage. Please find below screenshots for the same. Is anyone else finding system behaving better with April update?
One thing I can tell you is after device reset the system starts learning the usage pattern and their you need to f a k e your pattern intentionally to let system know your pattern and once it learns that your device has less usage it starts predicting more number of days to go last then you can start using the way you like. It will adjust again but not too much so usually you will get little more battery.