While I didn’t have that issue, switching my fp4 to e/OS did give me roughly 50% more time on the battery. There are software trade offs though so if you just want the OEM experience then I guess it’ll be a case of waiting for an update.