Framework: Fixes and improvements in Power Saver

Change-Id: I9708477d39481be0920436ba04d1071c623504a5