Settings: Fixes and improvements in Power Saver

Change-Id: I881b00c415674e09dbde9a1dbd09e88cfe2a5276