manually apply b-l side of changes for moving extensions from muon 79cd681c942605b3f013372622cca0540dc7e27b, lost in the shuffle
manually apply b-l side of changes for moving extensions from muon 79cd681c942605b3f013372622cca0540dc7e27b, lost in the shuffle

Test Plan:

luixxiul/browser-laptop,diasdavid/browser-laptop,diasdavid/browser-laptop,diasdavid/browser-laptop,luixxiul/browser-laptop,luixxiul/browser-laptop,luixxiul/browser-laptop,diasdavid/browser-laptop