Merge "Battery saver: new policy changes + SystemUI tweaks." into lmp-dev