Merge "Add BatteryInfo logging to settings" into oc-dr1-dev