diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt
index 3ba72655a796..0be56604f391 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt
@@ -49,8 +49,19 @@ sealed class AutoSavePostIfNotDraftResult(open val post: PostModel) {
             AutoSavePostIfNotDraftResult(post)
 }
 
-// TODO: Add documentation (add shortcode for the p2 discussion)
-// TODO: Add unit tests
+/**
+ * This is a use case that auto-saves a post if it's not a DRAFT in remote and returns various results depending
+ * on the remote post status and whether network requests were successful.
+ *
+ * The reason auto-save is tied to post status is that the `/autosave` REST endpoint will override the changes to
+ * a `DRAFT` directly rather than auto-saving it. While doing so, it'll also disable comments for the post due to
+ * a bug. Both the fact that the endpoint does something we are not expecting and the bug that results from it is
+ * avoided by only calling the `/autosave` endpoint for posts that are not in DRAFT status. We update DRAFTs directly
+ * just as the endpoint would have, but that makes the logic more clear on the client side while avoiding the
+ * comments getting disabled bug.
+ *
+ * See p3hLNG-15Z-p2 for more info.
+ */
 class AutoSavePostIfNotDraftUseCase @Inject constructor(
     private val dispatcher: Dispatcher,
     private val postStore: PostStore,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
index e0a659b9be24..59339e081561 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
@@ -607,13 +607,16 @@ private String uploadImageFile(MediaFile mediaFile, SiteModel site) {
         }
     }
 
-    // TODO: document?
     @Override
     public void handleAutoSavePostIfNotDraftResult(@NotNull AutoSavePostIfNotDraftResult result) {
         PostModel post = result.getPost();
         if (result instanceof FetchPostStatusFailed
             || result instanceof PostAutoSaveFailed
             || result instanceof PostAutoSaved) {
+            /*
+             * If we fail to check the status of the post or auto-save fails, we deliberately don't show an error
+             * notification since it's not a user initiated action. We'll retry the action later on.
+             */
             mPostUploadNotifier.incrementUploadedPostCountFromForegroundNotification(post);
             finishUpload();
         } else if (result instanceof PostIsDraftInRemote) {