More Battery Saver Mode Options

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
Settings: Reoder Display Settings

Change-Id: Ief17f60a3efadb77dc36b6f13ae4f1577f248cb3