Fix Force Close for tablets like Flo
Port battery saver mode: updates (2/2)

credits Yanuar Harry<ai.the.smarties.physics@gmail.com>

originally ported from Dan Trifan <jimsth@gmail.com>

Signed-off-by: hany <hany.alsamman@gmail.com>