Merge "Update battery saver sticky preference description" into main