Merge "Fix double wallpaper attachment (race) when it is gone"

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

@@ -1337,6 +1337,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
                     }
                     FgThread.getHandler().removeCallbacks(mResetRunnable);
                     mContext.getMainThreadHandler().removeCallbacks(mTryToRebindRunnable);
+                    mContext.getMainThreadHandler().removeCallbacks(mDisconnectRunnable);
                 }
             }
         }