One thing I noticed and fixed in my patch for bug 867175 (#9774) was the presence of strings for `needsCandidatePanel` in `layout.js`, maybe you can remove them with this patch as well