Bug 847309 - Better handle widget user customization.

https://bugzilla.mozilla.org/show_bug.cgi?id=847309

Work in progress, need more testing with custom firefox builds.