Merge "Fix BatterySaverPolicy night mode flag parsing."