Merge "Add new sticky battery saver strings"