Merge "Fix up storage UI for old USB storage."