Merge "allow devs to turn off charging notifications"