Revert "[2/2] Squashed: Battery Saver mode "