Merge pull request #13755 from eeejay/bug-939070

Bug 939070 - [Settings] Fix <small> selector regression from bug #914892. r=kaze
Bug 938943 - Fix Show Password checkbox in settings