Merge remote-tracking branch 'origin/develop-2.x' into develop-2.x

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

@@ -19,6 +19,8 @@
     <include
         android:id="@+id/picker_container"
         layout="@layout/emoji_picker"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@+id/emoji_actions_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"