Merge "Update battery percentage preference strings"