Merge "Update severe (5%/1 hour) warning to send through battery saver" into pi-dev