Merge remote-tracking branch 'origin/develop' into develop

src/UserSettingsStore.js

@@ -36,13 +36,21 @@ export default {
     getLabsFeatures() {
         const featuresConfig = SdkConfig.get()['features'] || {};
 
-        return FEATURES.filter((f) => {
+        // The old flag: honourned for backwards compat
-            const sdkConfigValue = featuresConfig[f.id];
+        const enableLabs = SdkConfig.get()['enableLabs'];
 
-            if (sdkConfigValue === 'labs') {
+        let labsFeatures;
-                return true;
+        if (enableLabs) {
-            }
+            labsFeatures = FEATURES;
-        }).map((f) => {
+        } else {
+            labsFeatures.filter((f) => {
+                const sdkConfigValue = featuresConfig[f.id];
+                if (sdkConfigValue === 'labs') {
+                    return true;
+                }
+            });
+        }
+        return labsFeatures.map((f) => {
             return f.id;
         });
     },