Merge "Sticky battery saver" into pi-dev