Merge "Fix "auto battery saver notification comes back"" into pi-dev