Merge "Fix layout"

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

    <LinearLayout

         android:layout_width="match_parent"

         android:layout_height="match_parent"

         android:layout_height="wrap_content"

         android:layout_marginStart="8dip"

         android:layout_marginEnd="8dip"

         android:orientation="vertical">