Merge pull request #7914 from dhylands/dhylands-836621-adb-master

Bug 836621 - Remote debugging (and hence ADB) should only be disabled by default for user builds. r=fabrice