Merge "defer firmware load until after filesystems are mounted"