Merge branch 'develop-2.x' into new/color-attachment-again

app/src/main/res/layout/fragment_profile.xml

@@ -8,13 +8,18 @@
     android:focusableInTouchMode="true"
     tools:context=".profile.ui.ProfileFragment">
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <LinearLayout
             android:id="@+id/profile_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="vertical"
-        android:visibility="gone">
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <include
                 android:id="@+id/layout_avatar_profile"
@@ -53,9 +58,12 @@
                 android:layout_marginTop="16dp"
                 android:drawableStart="@drawable/ic_link_black_24dp"
                 android:hint="@string/msg_avatar_url"
-            android:inputType="text" />
+                android:inputType="text"
+                android:layout_marginBottom="16dp"/>
         </LinearLayout>
 
+    </ScrollView>
+
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
         android:layout_width="wrap_content"