Merge "Rework battery saver synchronization logic" into pi-dev