Bug 881727 - Move the type of switch controls to the top level element.

https://bugzilla.mozilla.org/show_bug.cgi?id=881727