Merge branch 'feature/3310_notes_room_icon' into develop

# Conflicts:
#	bwi/BwiBuildSettings.swift

Riot/Modules/TabBar/MasterTabBarController.m

@@ -1218,6 +1218,17 @@
     if (BuildSettings.bwiPersonalNotesRoom) {
         [service createPersonalNotesRoomIfNeeded];
     }
+    if (BwiBuildSettings.bwiUseCustomPersonalNotesAvatar) {
+        MXSession *mainSession = mxSessionArray.firstObject;
+        
+        if (mainSession) {
+            for (MXRoom* room in [mainSession roomsWithTag:PersonalNotesDefaultService.roomTag]) {
+                if ([room.summary.avatar length] > 0) {
+                    [room setAvatar:@"" success:nil failure:nil];
+                }
+            }
+        }
+    }
 }
 
 #pragma mark - bwi matomo tracking