Merge "WindowState: Correct simple scaling error" into sc-dev

            getPendingTransaction().setMatrix(getSurfaceControl(),

                newHScale, 0, 0, newVScale);

            mLastGlobalScale = mGlobalScale;

            mLastHScale = mHScale;

            mLastVScale = mVScale;

            mLastHScale = newHScale;

            mLastVScale = newVScale;

        }

    }