Merge "Fix thumbnail disappearing during staged split animation" into tm-dev

quickstep/src/com/android/quickstep/views/FloatingTaskThumbnailView.java

@@ -62,6 +62,7 @@ public class FloatingTaskThumbnailView extends View {
 
         // Scale down the bitmap to fix x, and crop in y.
         float scale = 1.0f * getMeasuredWidth() / mBitmap.getWidth();
+        mMatrix.reset();
         mMatrix.postScale(scale, scale);
         mBitmapShader.setLocalMatrix(mMatrix);
 

quickstep/src/com/android/quickstep/views/FloatingTaskView.java

@@ -91,6 +91,8 @@ public class FloatingTaskView extends FrameLayout {
         // Copy bounds of exiting thumbnail into ImageView
         mThumbnailView.setThumbnail(thumbnail);
 
+        mThumbnailView.setVisibility(VISIBLE);
+
         RecentsView recentsView = launcher.getOverviewPanel();
         mOrientationHandler = recentsView.getPagedOrientationHandler();
         mSplitPlaceholderView.setIcon(icon,