Merge "Fix sticky battery saver toggle"