Fix Bug 963816 - update privacy center
Fix the remaining issues in Bug 963816 Comment 98 & 99
Merge pull request #1637 from kyoshino/bug-963816-update-privacy-center

Fix Bug 963816 - update privacy center