Merge "Make battery saver suggestion configurable" into pi-dev