Revert "Fixes to fit Battery saver mode"

This reverts commit 497648029557ad64933b058e7fa420f0548057fc.
Revert "[3/3] Settings: Battery Saver mode"

This reverts commit e0f823f7359257ffef23ab25f000267a511165cb.