diff --git a/android-app/src/main/res/layout-land/main_first_pane.xml b/android-app/src/main/res/layout-land/main_first_pane.xml
index d2746b83..496e5bec 100644
--- a/android-app/src/main/res/layout-land/main_first_pane.xml
+++ b/android-app/src/main/res/layout-land/main_first_pane.xml
@@ -53,7 +53,7 @@
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
-		<LinearLayout
+		<FrameLayout
 			a:id="@+id/displayContainer"
 			a:layout_width="0dp"
 			a:layout_height="match_parent"
diff --git a/android-app/src/main/res/layout-land/main_first_pane_mobile.xml b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
index fecc7c2f..f3af4ef8 100644
--- a/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
+++ b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
@@ -50,7 +50,7 @@
 				a:layout_height="match_parent"
 				a:layout_weight="1"/>
 
-		<LinearLayout
+		<FrameLayout
 				a:id="@+id/displayContainer"
 				a:layout_height="match_parent"
 				a:layout_width="0dp"
diff --git a/android-app/src/main/res/layout-large-land/main_calculator.xml b/android-app/src/main/res/layout-large-land/main_calculator.xml
index 75131d56..6d1335c3 100644
--- a/android-app/src/main/res/layout-large-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-large-land/main_calculator.xml
@@ -47,7 +47,7 @@
 					style="?cpp_pane_style"
 					a:layout_weight="1"/>
 
-			<LinearLayout
+			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
diff --git a/android-app/src/main/res/layout-large/main_calculator.xml b/android-app/src/main/res/layout-large/main_calculator.xml
index 181d1ad7..cc22efdc 100644
--- a/android-app/src/main/res/layout-large/main_calculator.xml
+++ b/android-app/src/main/res/layout-large/main_calculator.xml
@@ -47,7 +47,7 @@
 					style="?cpp_pane_style"
 					a:layout_weight="3"/>
 
-			<LinearLayout
+			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
diff --git a/android-app/src/main/res/layout-xlarge-land/main_calculator.xml b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
index 5abdf0e1..5ee4e95b 100644
--- a/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
+++ b/android-app/src/main/res/layout-xlarge-land/main_calculator.xml
@@ -47,7 +47,7 @@
 					style="?cpp_pane_style"
 					a:layout_weight="3"/>
 
-			<LinearLayout
+			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
diff --git a/android-app/src/main/res/layout-xlarge/main_calculator.xml b/android-app/src/main/res/layout-xlarge/main_calculator.xml
index 11328246..566b8b0d 100644
--- a/android-app/src/main/res/layout-xlarge/main_calculator.xml
+++ b/android-app/src/main/res/layout-xlarge/main_calculator.xml
@@ -47,7 +47,7 @@
 					style="?cpp_pane_style"
 					a:layout_weight="4"/>
 
-			<LinearLayout
+			<FrameLayout
 					a:id="@+id/displayContainer"
 					a:layout_height="0dp"
 					a:layout_width="match_parent"
diff --git a/android-app/src/main/res/layout/main_calculator.xml b/android-app/src/main/res/layout/main_calculator.xml
index e3e8f0a6..1147ce44 100644
--- a/android-app/src/main/res/layout/main_calculator.xml
+++ b/android-app/src/main/res/layout/main_calculator.xml
@@ -46,7 +46,7 @@
 				a:layout_width="0dp"
 				a:layout_height="match_parent"/>
 
-		<LinearLayout
+		<FrameLayout
 				a:id="@+id/displayContainer"
 				a:layout_weight="4"
 				a:layout_width="0dp"
diff --git a/android-app/src/main/res/layout/main_calculator_mobile.xml b/android-app/src/main/res/layout/main_calculator_mobile.xml
index 3bcc7dae..f558ec76 100644
--- a/android-app/src/main/res/layout/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout/main_calculator_mobile.xml
@@ -47,7 +47,7 @@
 				a:layout_width="0dp"
 				a:layout_height="match_parent"/>
 
-		<LinearLayout
+		<FrameLayout
 				a:id="@+id/displayContainer"
 				a:layout_weight="4"
 				a:layout_width="0dp"