Settings: Hide Development settings when it is turned off

This commit hides the Development and Performance settings items
when the user turns off Development settings. This sets things back
to tapping x number of times on the build number to once again enable
developer settings

Change-Id: I6003f73f5abee54bb000f01757ecffe7b68dba59
Clean up and rearrangements