Merge "Update the string and action for battery saver notification" into 24D1-dev