Merge "Update the string and action for battery saver notification" into main