Revert merge errors

Author: gruszm

app/src/main/AndroidManifest.xml

@@ -16,12 +16,10 @@
         tools:targetApi="31">
         <activity
             android:name=".activities.AdvancedCalculatorActivity"
-            android:exported="false"
-            android:configChanges="orientation|screenSize"/>
+            android:exported="false"/>
         <activity
             android:name=".activities.HomeActivity"
-            android:exported="true"
-            android:configChanges="orientation|screenSize">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -30,8 +28,7 @@
         </activity>
         <activity
             android:name=".activities.SimpleCalculatorActivity"
-            android:exported="false"
-            android:configChanges="orientation|screenSize">
+            android:exported="true">
         </activity>
     </application>