adapt upstream changes

mastodon/src/main/res/drawable/bg_onboarding_panel.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
-		<color android:color="?colorM3Background"/>
+		<color android:color="?colorWindowBackground"/>
 	</item>
 	<item android:id="@+id/color_overlay">
-		<color android:color="?colorM3Primary"/>
+		<color android:color="?toolbarBackground"/>
 	</item>
 </layer-list>

mastodon/src/main/res/layout/fragment_onboarding_rules.xml

@@ -15,6 +15,7 @@
 		android:id="@+id/button_bar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:visibility="gone"
 		android:orientation="vertical">
 
 		<Button