Merge "Revert "Cap the low battery threshold at config_lowBatteryWarningLevel (=15)""