Move Battery Saver into Maple Engine
Couple of fixes for Settings>Battery FCs

Change-Id: Ia9b7d22c4d9be49593b2322eccd68027e327b780