Merge "USB: Enter class directory when the CCID driver is enabled"