Merge remote-tracking branch 'upstream/develop' into feature/improved-composer

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

src/ActiveRoomObserver.ts

@@ -16,6 +16,7 @@ limitations under the License.
 
 import { EventSubscription } from 'fbemitter';
 import RoomViewStore from './stores/RoomViewStore';
+import { EventSubscription } from 'fbemitter';
 
 type Listener = (isActive: boolean) => void;