Merge "Enhance battery saver event log" into pi-dev