Merge "Refactor battery saver logic + add "per device" setting"