Merge "Fix buttons not aligning to the right" into main

                </LinearLayout>

                <FrameLayout

                <LinearLayout

                    android:minHeight="@dimen/letterbox_restart_dialog_button_height"

                    android:layout_width="match_parent"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    style="?android:attr/buttonBarButtonStyle"

                    android:layout_gravity="end">

                    <Button

                        android:text="@string/letterbox_restart_restart"

                        android:contentDescription="@string/letterbox_restart_restart"/>

                </FrameLayout>

                </LinearLayout>

            </LinearLayout>