Merge "make battery saver configurable" into main