Merge "Ensure automatic battery saver won't stick" into pi-dev