Bug 1043857 - Follow up to bug 1042083, launch time regression
Merge pull request #22149 from etiennesegonzac/bug-1043857

Bug 1043857 - Follow up to bug 1042083, launch time regression r=alive
Bug 1035687 - [SMS] - check missing images