Merge "idle-maint: don't need to change discard_granularity"