Bug 947033 - Allow Settings to be called by activity without being a dialog
Merge pull request #14685 from timdream/settings-back

Bug 947033 - Allow Settings to be called by activity without being a dialog, r=rudyl,arthurcc