Merge "Refactor battery saver schedule method"