Merge "Revert "Add setting/experiment for small battery devices to have""