Merge pull request #7811 from zbraniecki/bug799747

Bug 808216: reorder CSS to avoid initial transition and whitescreen flash in Settings