Bug 827382 - Work around the white screen flicker in settings
r=kaze
Merge pull request #7517 from etiennesegonzac/bug-827382-settings-white-flickr

Bug 827382 - Work around the white screen flickr in settings
Auto-merge from branch 'master'