Merge "Fix "battery saver" notification keeping coming back." into pi-dev