Issue 1112 - Properly use polyfills in firstrun and settings pages