Merge "Fix issue #67019445: Detect BATTERY_LOW/OKAY"