Merge "Disable the BatteryUsageStatsStore feature" into sc-dev