Merge "Add system_sw_battery to SettingsToPropertiesMapper" into main