Merge "Fix scroll view size to match parent" into main

<androidx.core.widget.NestedScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="@dimen/large_dialog_width"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    <LinearLayout