Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev