Merge "BatteryDefender: Reduce the frequency of persist writes on battery defender" into sc-dev