Merge branch 'master' into donations

# Conflicts:
#	mastodon/build.gradle

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -404,6 +404,21 @@ public class ComposeFragment extends MastodonToolbarFragment implements ComposeE
 		super.onResume();
 	}
 
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		if(prevHadDraft){
+			prevHadDraft=false;
+			removeBackCallback(discardConfirmationCallback);
+		}
+	}
+
+	@Override
+	protected void onShown(){
+		super.onShown();
+		updateDraftState();
+	}
+
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);