Backing out 7fe2c77ebbf2
Backing out 0f687f920370
Backing out 987b3ec24f68
Backing out 0f687f920370
merge m-c to fx-team
Bug 931706 - Changing contentViewer.authorStyleDisabled should send a notification r=bz

From 38ce091c13f08060c76e0dd8821cbe62fc3aa0c1 Mon Sep 17 00:00:00 2001
Bug 754344 - Make in-content prefs navigation look like about:addons r=jaws

From 958cacee91f0730b407bf35a65dd0bc9116cdd9e Mon Sep 17 00:00:00 2001