Bug 881727 - Reveal the type of input controls to the top level element
Merge pull request #10476 from crh0716/881727_v2

Bug 881727 - Move the type of switch controls to the top level element. r=lightsofapollo, jmcf, fcampo, daleharvey, salva, asuth, timdream, schung, kaze, basiclines, etienne