Merge "storage: Defer blkio class configuration" into main