Merge branch 'develop' into dla/feature/room_list_decoration

Author: langleyd

app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
         android:name=".ElementXApplication"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"