Merge branch 'feature/5433_foss_merge' into develop

Riot/Modules/Settings/SettingsViewController.m

@@ -415,6 +415,11 @@ SSOAuthenticationPresenterDelegate>
     self.screenTracker = [[AnalyticsScreenTracker alloc] initWithScreen:AnalyticsScreenSettings];
 }
 
+- (void)dealloc {
+    // Fix for destroy not being called
+    [self destroy];
+}
+
 - (void)updateSections
 {
     NSMutableArray<Section*> *tmpSections = [NSMutableArray arrayWithCapacity:SECTION_TAG_DEVELOPER + 1];