fix: #6657 Cannot read property 'controller' of undefined#6661

nilptr wants to merge 2 commits intofirebase:masterfirebase/firebase-js-sdk:masterfrom

nilptr:nilptr/fix-service-worker-npenilptr/firebase-js-sdk:nilptr/fix-service-worker-npeCopy head branch name to clipboard