Merge remote-tracking branch 'upstream/master'

src/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java

@@ -73,12 +73,6 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
     return false;
   }
 
-  @Override
-  public void onBackPressed() {
-    saveSelection();
-    super.onBackPressed();
-  }
-
   private void saveSelection() {
     Intent resultIntent = getIntent();
     List<String> selectedContacts = contactsFragment.getSelectedContacts();

src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java

@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 import android.text.InputFilter;
 import android.util.AttributeSet;
+import android.view.inputmethod.EditorInfo;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
@@ -29,6 +30,7 @@ public class EmojiEditText extends AppCompatEditText {
     if (!Prefs.isSystemEmojiPreferred(getContext())) {
       setFilters(appendEmojiFilter(this.getFilters()));
     }
+    setImeOptions(getImeOptions() | EditorInfo.IME_FLAG_NO_FULLSCREEN);
   }
 
   public void insertEmoji(String emoji) {