skip rebranding current brand - support for skins
    
    skip rebranding current brand - support for skins
    (cherry picked from commit 4687d68e49201f81094deedd99792fd4dda5725d)
    (cherry picked from commit 5fe2312f29763c869b9fd1c38a36632636b60016)
    (cherry picked from commit 55fa49d238f8d49d9f2b41cdc98a6e85156969eb)