Merge "Revert "storage: Defer blkio class configuration"" into main